Reset clip region back to NULL on cached GC (rest of #134728)

Wed Feb 18 14:27:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gdk/gdkwindow.c (gdk_window_get_composite_drawable): Reset clip
	region back to NULL on cached GC (rest of #134728)

diff --git a/ChangeLog b/ChangeLog
index b13a29e0c106bf9b19d8721627ca285137d7f4c1..9020a70b2a043e9dc9b04dcf60730de6a646e84d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+Wed Feb 18 14:27:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/gdkwindow.c (gdk_window_get_composite_drawable): Reset clip
+       region back to NULL on cached GC (rest of #134728)
+
 Wed Feb 18 13:28:57 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
-       Fix bug reported by Nam SungHyun.
+       Fix bug reported by Nam SungHyun (#134728)
        
        * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_threshold_alpha):
        Don't use a cached GC here since the function needs to modify the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b13a29e0c106bf9b19d8721627ca285137d7f4c1..9020a70b2a043e9dc9b04dcf60730de6a646e84d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,6 +1,11 @@
+Wed Feb 18 14:27:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/gdkwindow.c (gdk_window_get_composite_drawable): Reset clip
+       region back to NULL on cached GC (rest of #134728)
+
 Wed Feb 18 13:28:57 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
-       Fix bug reported by Nam SungHyun.
+       Fix bug reported by Nam SungHyun (#134728)
        
        * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_threshold_alpha):
        Don't use a cached GC here since the function needs to modify the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b13a29e0c106bf9b19d8721627ca285137d7f4c1..9020a70b2a043e9dc9b04dcf60730de6a646e84d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,6 +1,11 @@
+Wed Feb 18 14:27:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/gdkwindow.c (gdk_window_get_composite_drawable): Reset clip
+       region back to NULL on cached GC (rest of #134728)
+
 Wed Feb 18 13:28:57 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
-       Fix bug reported by Nam SungHyun.
+       Fix bug reported by Nam SungHyun (#134728)
        
        * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_threshold_alpha):
        Don't use a cached GC here since the function needs to modify the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b13a29e0c106bf9b19d8721627ca285137d7f4c1..9020a70b2a043e9dc9b04dcf60730de6a646e84d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,6 +1,11 @@
+Wed Feb 18 14:27:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/gdkwindow.c (gdk_window_get_composite_drawable): Reset clip
+       region back to NULL on cached GC (rest of #134728)
+
 Wed Feb 18 13:28:57 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
-       Fix bug reported by Nam SungHyun.
+       Fix bug reported by Nam SungHyun (#134728)
        
        * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_threshold_alpha):
        Don't use a cached GC here since the function needs to modify the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b13a29e0c106bf9b19d8721627ca285137d7f4c1..9020a70b2a043e9dc9b04dcf60730de6a646e84d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,6 +1,11 @@
+Wed Feb 18 14:27:08 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gdk/gdkwindow.c (gdk_window_get_composite_drawable): Reset clip
+       region back to NULL on cached GC (rest of #134728)
+
 Wed Feb 18 13:28:57 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
-       Fix bug reported by Nam SungHyun.
+       Fix bug reported by Nam SungHyun (#134728)
        
        * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_threshold_alpha):
        Don't use a cached GC here since the function needs to modify the

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 817aba27a4f5abab0d88c4d868b03b2c18c7be1e..a1fc8294bd4f584c5fe77e0b21d7fedb0df9dc88 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1033,6 +1033,7 @@ gdk_window_end_paint (GdkWindow *window)
                      clip_box.x - x_offset, clip_box.y - y_offset,
                      clip_box.width, clip_box.height);
 
+  /* Reset clip region of the cached GdkGC */
   gdk_gc_set_clip_region (tmp_gc, NULL);
   
   g_object_unref (paint->pixmap);
@@ -1424,6 +1425,9 @@ gdk_window_get_composite_drawable (GdkDrawable *drawable,
                         0, 0, width, height);
     }
 
+  /* Reset clip region of the cached GdkGC */
+  gdk_gc_set_clip_region (tmp_gc, NULL);
+
   /* Set these to location of tmp_pixmap within the window */
   *composite_x_offset = x;
   *composite_y_offset = y;